- Remove vendor optimizations from CFLAGS [1]

- Preserve configuration file modifications across updates
- Substitute %%PREFIX%% in the configuration file
- Add missing dependency on libpng
- Use GNU_CONFIGURE
- Remove CONFIGURE_ARGS (the passed options are the defaults)
- Respect ${LOCALBASE} and ${X11BASE}

[1]:
PR:		ports/91927
Submitted by:	maintainer

x11-wm/jwm/Makefile

@@ -14,27 +14,29 @@ MASTER_SITES=	http://joewing.net/programs/jwm/ \
 MAINTAINER=	babak@farrokhi.net
 COMMENT=	Joe's Window Manager
 
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --enable-icons --enable-png \
-			--enable-xpm --enable-shape --enable-xinerama \
-			--enable-xft --enable-xrender
+CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 MAN1=		jwm.1
-PLIST_FILES=	bin/jwm etc/system.jwmrc
 
 post-patch:
-	    @${REINPLACE_CMD} -e 's,^CC =,CC ?=,' \
-	        -e 's,^CFLAGS =,CFLAGS +=,' \
-		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc
+	${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc.sample
+	if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \
+		${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \
+	fi
 	${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1/
 
 .include <bsd.port.mk>

x11-wm/jwm/pkg-plist

@@ -0,0 +1,4 @@
+bin/jwm
+@unexec if cmp -s %D/etc/system.jwmrc %D/etc/system.jwmrc.sample; then rm -f %D/etc/system.jwmrc; fi
+etc/system.jwmrc.sample
+@exec if [ ! -f %D/etc/system.jwmrc ]; then cp -p %D/etc/system.jwmrc.sample %D/etc/system.jwmrc; fi