From nobody Tue Oct 24 13:08:44 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFC7058Jmz4y2BJ; Tue, 24 Oct 2023 13:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFC703LRMz4W4J; Tue, 24 Oct 2023 13:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698152924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxWWFUla8J/QiO9ka1rQxjVyz3rjZ+QfB6YlgNYM6xM=; b=C1v8kP0Bw7nu0V+H4TCBqF0EiG31f5OLsVoRMrVWolGLeW3S8dCFBgZ7E/WCoO0bzkGCsd Hp7D/csRP9YwckzJ25/UCB22huIxhDmixVJmRJEKTJJm+8mAzeOaoFW4pQi0NEIWi5qZRP sjvD59mKQS/jWfApPohXI7OZoMTRPh2qX5byyz+Mavk5n8T97fp0oLMU3xyfI6mKPasLTW R3zahLCOzlQm2xrhreo4VVtuBLDswi42BahURqo5GGkh70ATauc8Mks3dKQfI0dGdd9rWA kvzfKtka9pPalLPjcDpin/VMO/2g+YcNny5StW5ZKwPziGUJInzn90mlgKfWiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698152924; a=rsa-sha256; cv=none; b=URci0DfIUdyMqzE2fm+euzdxowdrF8oTHE/fv6pJv/mSU58XnP5aBP24I20bJQWAsvcdT9 kXQbImvMCndTdMPVKnhy7hH50da7OO4Qg6f+P66FxDrsATmcb6aOCTlc3GO112WS1Ol2FC vm2nXdFr5kyM0VJvR0LRdOQK/bNXWFqGwIGfy/mUC0PJ+bHpAXbHnwzjQUdW0mduOFM1BN UPQF6GF0HWGCYKr+vX8n+ZdH7jZPPhC3FULLoOpFtzm7AwVrDPZc5jai7F576YY9QjVr/c sE9xczqD0U43dT81SuTaIfBU9dtb4FCSA1SvG63trZlQbY73VZI6Bkz21uFuyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698152924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxWWFUla8J/QiO9ka1rQxjVyz3rjZ+QfB6YlgNYM6xM=; b=M1X0cXCezOPF8Is2ZDABY3cyGfn5SGnfq14K1pzovOF+lPvZkSx1ZIM/t9bYuwN7aPs2iz CKbR7mT9QgphTjTMG+00gpwyN5FYbu5pIcBi9Lp96EZza8Rah1d8oE7duy/XYSYidqCfQ/ Y4LXgWhi5Fd2/F5BuoJTGM6KESgUxwa3jI7PuWRFAzn7Zexhi0KWPw0zLss7YJnHWUXm3o Ybbafss7iiRHxgNSy0HTXHgyBTwmc5KhkM3q8310SdaKE0OxY9vhtHsuSZGwLiDTkv3drZ X6AofzrM85qbSX48F/iKhSjPwz0yEjTwVS8Gr3qjCWR1a4oUeXUD02ny4OHyIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFC702SbFz8q9; Tue, 24 Oct 2023 13:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OD8iGF038976; Tue, 24 Oct 2023 13:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OD8iKb038973; Tue, 24 Oct 2023 13:08:44 GMT (envelope-from git) Date: Tue, 24 Oct 2023 13:08:44 GMT Message-Id: <202310241308.39OD8iKb038973@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: a394e0cd6d08 - main - print/hp2xx: Optionize INFO List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a394e0cd6d0821125751118282fb454b161d34a6 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=a394e0cd6d0821125751118282fb454b161d34a6 commit a394e0cd6d0821125751118282fb454b161d34a6 Author: Muhammad Moinur Rahman AuthorDate: 2023-10-23 15:53:54 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-10-24 13:08:27 +0000 print/hp2xx: Optionize INFO - Utilize USES=localbase - Pet portclippy --- print/hp2xx/Makefile | 26 ++++++++++++++++---------- print/hp2xx/files/patch-Makefile | 29 +++++++++++++++++------------ print/hp2xx/files/patch-png.c | 6 +++--- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile index 289a6628305b..fee0e58dd32b 100644 --- a/print/hp2xx/Makefile +++ b/print/hp2xx/Makefile @@ -13,26 +13,32 @@ LICENSE= GPLv2+ LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff -WRKSRC_SUBDIR= sources +USES= jpeg localbase:ldflags -USES= makeinfo -MAKE_ARGS= infodir=${PREFIX}/${INFO_PATH} MAKE_ENV= DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" -CPPFLAGS+= -DUNIX -I${LOCALBASE}/include -LDFLAGS+= -lm -L${LOCALBASE}/lib -ltiff -lpng -lz +CPPFLAGS+= -DUNIX +LDFLAGS+= -lm -ltiff -lpng -lz + +WRKSRC_SUBDIR= sources -INFO= hp2xx PLIST_FILES= bin/hp2xx man/man1/hp2xx.1.gz -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT= X11 +OPTIONS_DEFINE= INFO X11 +OPTIONS_DEFAULT= INFO X11 +INFO_USES= makeinfo +INFO_MAKE_ARGS= infodir=${PREFIX}/${INFO_PATH} +INFO_INFO= hp2xx X11_USES= xorg X11_USE= XORG=x11 X11_MAKE_ENV= PREVIEWER=to_x11 X11_MAKE_ENV_OFF= PREVIEWER=no_prev -X11_CPPFLAGS= -DHAS_UNIX_X11 -I${LOCALBASE}/include -X11_LDFLAGS= -L${LOCALBASE}/lib -lX11 +X11_CPPFLAGS= -DHAS_UNIX_X11 +X11_LDFLAGS= -lX11 + +post-patch-INFO-off: + @${REINPLACE_CMD} -e '/^all:/s|hp2xx.info||g; \ + /^install:/s|install-info||g' ${WRKSRC}/Makefile .include diff --git a/print/hp2xx/files/patch-Makefile b/print/hp2xx/files/patch-Makefile index 247d98273af5..4104a0d2f9f7 100644 --- a/print/hp2xx/files/patch-Makefile +++ b/print/hp2xx/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Jun 22 00:16:34 2003 -+++ Makefile Tue Jun 24 07:53:46 2003 -@@ -35,7 +35,7 @@ +--- Makefile.orig 2003-06-21 15:16:34 UTC ++++ Makefile +@@ -35,7 +35,7 @@ STRIP = strip # Installation sites (GNU conventions): # @@ -9,7 +9,7 @@ bindir = $(prefix)/bin includedir = $(prefix)/include mandir = $(prefix)/man -@@ -45,14 +45,14 @@ +@@ -45,14 +45,14 @@ infodir = $(prefix)/info # CC and CFLAGS set for gcc, but any ANSI-C compiler should work. # For non-gcc compilers, simply set CFLAGS = -O (to start with) # @@ -27,7 +27,7 @@ CPPFLAGS = -I. # only sometimes needed; see below for examples BINDCMD = # only needed for EMX and DJGPP DOS extenders -@@ -65,9 +65,9 @@ +@@ -65,9 +65,9 @@ BINDCMD = # only needed for EMX and DJ # # Generic UNIX + X11 previewer (default) # @@ -40,7 +40,7 @@ # # for experimental truetype font support # -@@ -230,13 +230,13 @@ +@@ -230,13 +230,13 @@ ALL_CFLAGS = -c $(CFLAGS) # $(SRCS) NOT USED YET: SRCS = clip.c fillpoly.c\ @@ -56,17 +56,18 @@ to_vec.o to_pcx.o to_pcl.o to_eps.o to_img.o to_pbm.o \ to_rgip.o to_fig.o std_main.o $(PREVIEWER).o pendef.o lindef.o $(EX_OBJ) -@@ -244,7 +244,8 @@ +@@ -244,8 +244,9 @@ PROGRAM = hp2xx $(PROGRAM): $(OBJS) $(CC) $(LFLAGS) $(OBJS) $(ALL_LIBS) $(EX_LIBS) -o $(PROGRAM) - $(BINDCMD) -+ -+all: $(PROGRAM) hp2xx.info ++all: $(PROGRAM) ++ default: @echo "This makefile needs manual configuration! Edit it now! -@@ -268,9 +269,9 @@ + @echo "After configuration, you may use the following commands: +@@ -268,9 +269,9 @@ default: # # ######################################################################### @@ -79,8 +80,12 @@ ######################################################################### -@@ -330,15 +331,11 @@ - install: install-bin install-info install-man +@@ -327,18 +328,14 @@ realclean: + TAGS: + @echo make TAGS -- not supported nor needed. + +-install: install-bin install-info install-man ++install: install-bin install-man install-bin: $(PROGRAM) - -$(STRIP) $(PROGRAM) diff --git a/print/hp2xx/files/patch-png.c b/print/hp2xx/files/patch-png.c index 48162b3d7dae..a3973fd0202a 100644 --- a/print/hp2xx/files/patch-png.c +++ b/print/hp2xx/files/patch-png.c @@ -1,5 +1,5 @@ ---- png.c.orig 2003-06-21 17:31:51.000000000 +0200 -+++ png.c 2012-05-06 06:59:14.000000000 +0200 +--- png.c.orig 2003-06-21 15:31:51 UTC ++++ png.c @@ -6,6 +6,7 @@ #include #include "to_png.h" @@ -8,7 +8,7 @@ #define PDNCOL 256 -@@ -36,7 +37,7 @@ +@@ -36,7 +37,7 @@ FILE *fd; } /* set up error handlimg for libpng */